d6d33f5d2ddcb3438169385a2dac5ac2754105ef,grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractPersistentEntity.java,AbstractPersistentEntity,initialize,#,117

Before Change


            }


            final PersistentProperty idProp = getPropertyByName(GormProperties.IDENTITY);
            if(idProp != null) {
                persistentProperties.remove(idProp);
                persistentPropertyNames.remove(GormProperties.IDENTITY);

After Change


            }


            final PersistentProperty idProp = identity != null ? identity : getPropertyByName(GormProperties.IDENTITY);
            if(idProp != null) {
                persistentProperties.remove(idProp);
                persistentPropertyNames.remove(idProp.getName());
                if(!idProp.getName().equals(GormProperties.IDENTITY)) {
                    PersistentProperty otherId = getPropertyByName(GormProperties.IDENTITY);
                    persistentProperties.remove(otherId);
                    persistentPropertyNames.remove(GormProperties.IDENTITY);